gdkwindow-quartz: Support native fullscreen mode

This implements native fullscreen mode on OS X >= 10.7. This patch
adds tracking of the fullscreen mode if externally modified, as well
as toggling the native fullscreen mode of the window as needed.

diff --git a/gdk/quartz/GdkQuartzNSWindow.c b/gdk/quartz/GdkQuartzNSWindow.c
index 8ab09ebea7797880c4a8fc10d5babdae28950b40..6bc05a4c4db0e8e69bd117a0485b6878317ecf4f 100644 (file)
--- a/gdk/quartz/GdkQuartzNSWindow.c
+++ b/gdk/quartz/GdkQuartzNSWindow.c
@@ -654,4 +654,19 @@ update_context_from_dragging_info (id <NSDraggingInfo> sender)
   _gdk_quartz_drag_source_context = NULL;
 }
 
+- (void)setStyleMask:(NSUInteger)styleMask
+{
+  gboolean was_fullscreen;
+  gboolean is_fullscreen;
+
+  was_fullscreen = (([self styleMask] & NSFullScreenWindowMask) != 0);
+
+  [super setStyleMask:styleMask];
+
+  is_fullscreen = (([self styleMask] & NSFullScreenWindowMask) != 0);
+
+  if (was_fullscreen != is_fullscreen)
+    _gdk_quartz_window_update_fullscreen_state ([[self contentView] gdkWindow]);
+}
+
 @end

diff --git a/gdk/quartz/GdkQuartzNSWindow.h b/gdk/quartz/GdkQuartzNSWindow.h
index e60232a91d672ab4f79b4f841080884fd05163e5..80b910cffcf52b2963f4e75dc492a26b79dda666 100644 (file)
--- a/gdk/quartz/GdkQuartzNSWindow.h
+++ b/gdk/quartz/GdkQuartzNSWindow.h
@@ -42,6 +42,7 @@
 -(BOOL)trackManualResize;
 -(void)showAndMakeKey:(BOOL)makeKey;
 -(void)hide;
+-(void)setStyleMask:(NSUInteger)styleMask;
 
 @end
 

diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index 365dcbb1878d70c072d2f02e57c8ce30020b580a..5d2fcc1517441e5463837e9a1099b3e5ddca34e4 100644 (file)
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -216,7 +216,7 @@ void       _gdk_quartz_window_debug_highlight       (GdkWindow *window,
                                                      gint       number);
 
 void       _gdk_quartz_window_update_position           (GdkWindow    *window);
-
+void       _gdk_quartz_window_update_fullscreen_state   (GdkWindow    *window);
 
 /* Window methods - testing */
 void     _gdk_quartz_window_sync_rendering    (GdkWindow       *window);

diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
index b3cc8dedce622b1834f9dbb01f23a2668306bb76..d5a9923b49dd3b1f9b85d313691fb0ac1d5301d2 100644 (file)
--- a/gdk/quartz/gdkwindow-quartz.c
+++ b/gdk/quartz/gdkwindow-quartz.c
@@ -29,6 +29,7 @@
 #include "gdkquartzcursor.h"
 
 #include <Carbon/Carbon.h>
+#include <AvailabilityMacros.h>
 
 #include <sys/time.h>
 #include <cairo-quartz.h>
@@ -43,6 +44,10 @@ static GSList *main_window_stack;
 
 void _gdk_quartz_window_flush (GdkWindowImplQuartz *window_impl);
 
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+static FullscreenSavedGeometry *get_fullscreen_geometry (GdkWindow *window);
+#endif
+
 #define FULLSCREEN_DATA "fullscreen-data"
 
 typedef struct
@@ -56,8 +61,6 @@ typedef struct
 static void update_toplevel_order (void);
 static void clear_toplevel_order  (void);
 
-static FullscreenSavedGeometry *get_fullscreen_geometry (GdkWindow *window);
-
 #define WINDOW_IS_TOPLEVEL(window)                  \
   (GDK_WINDOW_TYPE (window) != GDK_WINDOW_CHILD &&   \
    GDK_WINDOW_TYPE (window) != GDK_WINDOW_FOREIGN && \
@@ -1170,8 +1173,10 @@ gdk_window_quartz_hide (GdkWindow *window)
   GdkWindowImplQuartz *impl;
 
   /* Make sure we're not stuck in fullscreen mode. */
+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
   if (get_fullscreen_geometry (window))
     SetSystemUIMode (kUIModeNormal, 0);
+#endif
 
   check_grab_unmap (window);
 
@@ -2635,6 +2640,66 @@ gdk_quartz_window_deiconify (GdkWindow *window)
     }
 }
 
+#ifdef AVAILABLE_MAC_OS_X_VERSION_10_7_AND_LATER
+
+static gboolean
+window_is_fullscreen (GdkWindow *window)
+{
+  GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
+
+  return ([impl->toplevel styleMask] & NSFullScreenWindowMask) != 0;
+}
+
+static void
+gdk_quartz_window_fullscreen (GdkWindow *window)
+{
+  GdkWindowImplQuartz *impl;
+
+  if (GDK_WINDOW_DESTROYED (window) ||
+      !WINDOW_IS_TOPLEVEL (window))
+    return;
+
+  impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
+
+  if (!window_is_fullscreen (window))
+    [impl->toplevel toggleFullScreen:nil];
+}
+
+static void
+gdk_quartz_window_unfullscreen (GdkWindow *window)
+{
+  GdkWindowImplQuartz *impl;
+
+  if (GDK_WINDOW_DESTROYED (window) ||
+      !WINDOW_IS_TOPLEVEL (window))
+    return;
+
+  impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
+
+  if (window_is_fullscreen (window))
+    [impl->toplevel toggleFullScreen:nil];
+}
+
+void
+_gdk_quartz_window_update_fullscreen_state (GdkWindow *window)
+{
+  gboolean is_fullscreen;
+  gboolean was_fullscreen;
+
+  is_fullscreen = window_is_fullscreen (window);
+  was_fullscreen = (gdk_window_get_state (window) & GDK_WINDOW_STATE_FULLSCREEN) != 0;
+
+  if (is_fullscreen != was_fullscreen)
+    {
+      if (is_fullscreen)
+        gdk_synthesize_window_state (window, 0, GDK_WINDOW_STATE_FULLSCREEN);
+      else
+        gdk_synthesize_window_state (window, GDK_WINDOW_STATE_FULLSCREEN, 0);
+    }
+}
+
+#else
+
 static FullscreenSavedGeometry *
 get_fullscreen_geometry (GdkWindow *window)
 {
@@ -2718,6 +2783,8 @@ gdk_quartz_window_unfullscreen (GdkWindow *window)
     }
 }
 
+#endif
+
 static void
 gdk_quartz_window_set_keep_above (GdkWindow *window,
                                   gboolean   setting)